FINERACT-2412: Full term tranche - Schedule handling and Calculations #5294

mariiaKraievska · 2026-01-07T10:33:35Z

Description

Describe the changes made and why they were made. (Ignore if these details are present on the associated Apache Fineract JIRA ticket.)

Checklist

Please make sure these boxes are checked before submitting your pull request - thanks!

Write the commit message as per our guidelines
Acknowledge that we will not review PRs that are not passing the build ("green") - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
Create/update unit or integration tests for verifying the changes made.
Follow our coding conventions.
Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
This PR must not be a "code dump". Large changes can be made in a branch, with assistance. Ask for help on the developer mailing list.

Your assigned reviewer(s) will follow our guidelines for code reviews.

Aman-Mittal · 2026-01-09T08:59:10Z

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java

+        final LocalDate firstDisbursedPeriodStartDate = firstDisbursedPeriod.isPresent() ? firstDisbursedPeriod.get().getFromDate()
+                : scheduleModel.getMaturityDate();
+
+        final LoanApplicationTerms loanApplicationTerms = new LoanApplicationTerms.Builder()


I think this LoanAplicationBuilder Logic must be extracted to an new helper function. So that it is easier to read.

and group this chaining maybe like this?

// Loan basics
.currency(...)
.principal(...)
.repaymentsStartingFromDate(...)

// Term & frequency
.loanTermFrequency(...)
.numberOfRepayments(...)
.repaymentEvery(...)
.repaymentPeriodFrequencyType(...)

// Interest configuration
.interestRatePerPeriod(...)
.annualNominalInterestRate(...)
.interestRatePeriodFrequencyType(...)
.interestMethod(...)

// Day count conventions
.daysInMonthType(...)
.daysInYearType(...)
.daysInYearCustomStrategy(...)

// Flags & options
.isDownPaymentEnabled(false)
.allowPartialPeriodInterestCalculation(...)

// Technical
.mc(mc)

Aman-Mittal

Code wise seems ok, Not reviewed based on e2e tests due to my lack of functional knowlegede.

Message to Maintainer: Please cross-check the tests before merge

adamsaghy · 2026-01-12T13:00:32Z

...oanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java

        Money amortizableAmount = disbursementTransaction.getAmount(currency).minus(downPaymentAmount);
        emiCalculator.addDisbursement(model, transactionDate, amortizableAmount);

+        if (loan.isAllowFullTermForTranche() && loan.getNumberOfRepayments() > 0) {


We are already updating the installments by model as part of recalculateRepaymentPeriodsWithEMICalculation. Do we really need to do it again here?

One of them should be removed, no?

adamsaghy · 2026-01-12T13:00:57Z

...oanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java

        allocateOverpayment(disbursementTransaction, transactionCtx);
    }

+    private void updateInstallmentsByModel(final LoanTransaction loanTransaction, final ProgressiveTransactionCtx ctx) {


Check whether recalculateRepaymentPeriodsWithEMICalculation and updateInstallmentsByModel is duplication.

Removed updateInstallmentsByModel

adamsaghy · 2026-01-12T13:01:27Z

...-loan/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/data/RepaymentPeriod.java

        if (outstandingBalanceCalculation == null) {
            outstandingBalanceCalculation = Memo.of(() -> {
+                if (getInterestPeriods().isEmpty()) {
+                    return getZero();


Why would be the outstanding loan balance zero if there are no interest periods?

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java

adamsaghy · 2026-01-12T13:04:36Z

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java

+                .mc(mc).build();
+    }
+
+    private void mergeNewInterestScheduleModelWithExistingOne(final ProgressiveLoanInterestScheduleModel scheduleModel,


Misleading name, use something like this instead: mergeNewScheduleModelWithExistingOne

We already have a mergeNewInterestScheduleModelWithExistingOne function. Is his duplicate? Can we have just one?

mergeNewInterestScheduleModelWithExistingOne for re-aging actually has the different approach, I renamed it accordinally

adamsaghy · 2026-01-12T13:08:02Z

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java

+     * * Generates temporary interestScheduleModel with particular disbursement date
+     */
+    @NotNull
+    private ProgressiveLoanInterestScheduleModel generateTemporaryScheduleModelWithParticularDisbursementDate(


We already have a generateTemporaryReAgedScheduleModel function. Is this duplicate? Can we have just one?

Yes, you are right, left just one of them

adamsaghy

Kindly see my review!

adamsaghy · 2026-01-13T14:21:21Z

...oanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java

+                                loanTransaction.getLoan(), installmentCounter.get(), rm.getFromDate(), rm.getDueDate(),
+                                rm.getDuePrincipal().getAmount(), null, null, null, null, null, null, null, false, false, false);
+
+                        if (rm.getDueInterest().isGreaterThanZero()) {


We dont need this. Set interest in the constructor.

adamsaghy · 2026-01-13T14:21:47Z

...oanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java

                    installment.updateObligationsMet(currency, transactionDate);
+                } else {
+                    if (model.loanProductRelatedDetail().isAllowFullTermForTranche()
+                            && loanTransaction.getLoan().getNumberOfRepayments() > 0 && !rm.getDueDate().isBefore(transactionDate)) {


You can fetch this from the model.loanProductRelatedDetail()

mariiaKraievska force-pushed the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch 2 times, most recently from ff77199 to ee3752c Compare January 7, 2026 14:21

adamsaghy force-pushed the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch from ee3752c to 926421f Compare January 8, 2026 14:06

adamsaghy marked this pull request as ready for review January 8, 2026 17:37

Aman-Mittal reviewed Jan 9, 2026

View reviewed changes

mariiaKraievska force-pushed the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch from 926421f to cdaf5bc Compare January 9, 2026 10:17

Aman-Mittal approved these changes Jan 9, 2026

View reviewed changes

mariiaKraievska force-pushed the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch 2 times, most recently from 8ddfbe7 to 1c4cb36 Compare January 9, 2026 15:25

adamsaghy reviewed Jan 12, 2026

View reviewed changes

...n/src/main/java/org/apache/fineract/portfolio/loanproduct/calc/ProgressiveEMICalculator.java Show resolved Hide resolved

adamsaghy reviewed Jan 12, 2026

View reviewed changes

adamsaghy requested changes Jan 12, 2026

View reviewed changes

mariiaKraievska force-pushed the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch from 1c4cb36 to b817f5b Compare January 13, 2026 12:13

adamsaghy reviewed Jan 13, 2026

View reviewed changes

mariiaKraievska force-pushed the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch from b817f5b to d931e77 Compare January 13, 2026 14:39

mariiaKraievska marked this pull request as draft January 13, 2026 14:55

FINERACT-2412: Full term tranche - Schedule handling and Calculations

58f9ddc

mariiaKraievska force-pushed the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch from d931e77 to 58f9ddc Compare January 13, 2026 15:44

mariiaKraievska marked this pull request as ready for review January 13, 2026 15:46

adamsaghy merged commit 09031aa into apache:develop Jan 13, 2026
35 checks passed

adamsaghy deleted the FINERACT-2412/full-term-tranche-schedule-handling-and-calculation branch January 13, 2026 17:06

FINERACT-2412: Full term tranche - Schedule handling and Calculations #5294

FINERACT-2412: Full term tranche - Schedule handling and Calculations #5294

Conversation

mariiaKraievska commented Jan 7, 2026

Description

Checklist

Uh oh!

Aman-Mittal Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Aman-Mittal left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

adamsaghy Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adamsaghy Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adamsaghy left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Aman-Mittal Jan 9, 2026 •

edited

Loading

adamsaghy Jan 12, 2026 •

edited

Loading

adamsaghy Jan 12, 2026 •

edited

Loading